bitkeeper revision 1.1159.1.518 (41d448acXfjJK8iSoExMLCtViOvsoA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc .rootkeys
Simple merge

diff --cc xen/arch/x86/memory.c
Simple merge

diff --cc xen/arch/x86/setup.c
Simple merge

diff --cc xen/arch/x86/x86_32/mm.c
Simple merge

diff --cc xen/common/page_alloc.c
Simple merge

diff --cc xen/include/asm-x86/config.h
Simple merge

diff --cc xen/include/asm-x86/e820.h
Simple merge

diff --cc xen/include/asm-x86/mm.h
Simple merge

diff --cc xen/include/asm-x86/page.h
Simple merge